From: Jan Beulich Date: Tue, 5 Jul 2016 09:16:55 +0000 (+0200) Subject: x86emul: use consistent exit mechanism X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~832 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=f86eabea5d0fe1815b58f21259edf317ff91a65a;p=xen.git x86emul: use consistent exit mechanism Similar code should use similar exit mechanisms (return vs goto). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 460d1f74ad..f6e767ac7a 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2106,7 +2106,7 @@ x86_emulate( generate_exception_if(mode_64bit() && !ext, EXC_UD, -1); fail_if(ops->read_segment == NULL); if ( (rc = ops->read_segment(src.val, ®, ctxt)) != 0 ) - return rc; + goto done; /* 64-bit mode: PUSH defaults to a 64-bit operand. */ if ( mode_64bit() && (op_bytes == 4) ) op_bytes = 8; @@ -2125,10 +2125,9 @@ x86_emulate( if ( mode_64bit() && (op_bytes == 4) ) op_bytes = 8; if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), - &dst.val, op_bytes, ctxt, ops)) != 0 ) + &dst.val, op_bytes, ctxt, ops)) != 0 || + (rc = load_seg(src.val, dst.val, 0, NULL, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, dst.val, 0, NULL, ctxt, ops)) != 0 ) - return rc; break; case 0x0e: /* push %%cs */